From c39fbf81dae0f34dc484e151084db569ba4f9d47 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Mon, 2 Jul 2007 21:06:46 -0600 Subject: [PATCH] [IA64] Better warning fix This fixes it for gcc-3.x too. Signed-off-by: Alex Williamson --- xen/arch/ia64/xen/vcpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/ia64/xen/vcpu.c b/xen/arch/ia64/xen/vcpu.c index badfb2eac8..5928ce3029 100644 --- a/xen/arch/ia64/xen/vcpu.c +++ b/xen/arch/ia64/xen/vcpu.c @@ -496,7 +496,7 @@ IA64FAULT vcpu_set_psr(VCPU * vcpu, u64 val) PSCB(vcpu, interrupt_collection_enabled) = vpsr.ic; vcpu_set_metaphysical_mode(vcpu, !(vpsr.dt && vpsr.rt && vpsr.it)); - newpsr.cpl |= max((u64)vpsr.cpl, (u64)CONFIG_CPL0_EMUL); + newpsr.cpl |= max_t(u64, vpsr.cpl, CONFIG_CPL0_EMUL); if (PSCB(vcpu, banknum) != vpsr.bn) { if (vpsr.bn) -- 2.30.2